st/icon-theme: Pick best-matching name from all themes

When resolving an icon name, we currently look in all themes in
order whether one of the requested names matches.

That means, a "keyboard" icon from the configured theme will
trump over any of "keyboard-shift", "keyboard-brightness" and
"keyboard-preferences" from lower-ranked themes (like "Adwaita"
and "hicolor").

That applies to custom icons we include in the resource, which
are added to the fallback ("hicolor") theme.

We are less bound by the named-icons spec than GTK, so we can
adapt the lookup to prefer the most accurate match to matches
from the highest priority theme.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2824>

diff --git a/src/st/st-icon-theme.c b/src/st/st-icon-theme.c
index 9128c57efe8c5c2a38d0d654da7ad82d3c99477b..4b04264ebf3ac3931b34b16eb23ee2f4b3bf384e 100644 (file)
--- a/src/st/st-icon-theme.c
+++ b/src/st/st-icon-theme.c
@@ -1301,25 +1301,28 @@ real_choose_icon (StIconTheme       *icon_theme,
    * In other words: We prefer symbolic icons in inherited themes over
    * generic icons in the theme.
    */
-  for (l = icon_theme->themes; l; l = l->next)
+  for (i = 0; icon_names[i] && icon_name_is_symbolic (icon_names[i]); i++)
     {
-      theme = l->data;
-      for (i = 0; icon_names[i] && icon_name_is_symbolic (icon_names[i]); i++)
+      icon_name = icon_names[i];
+
+      for (l = icon_theme->themes; l; l = l->next)
         {
-          icon_name = icon_names[i];
+          theme = l->data;
+
           icon_info = theme_lookup_icon (theme, icon_name, size, scale, allow_svg);
           if (icon_info)
             goto out;
         }
     }
 
-  for (l = icon_theme->themes; l; l = l->next)
+  for (i = 0; icon_names[i]; i++)
     {
-      theme = l->data;
+      icon_name = icon_names[i];
 
-      for (i = 0; icon_names[i]; i++)
+      for (l = icon_theme->themes; l; l = l->next)
         {
-          icon_name = icon_names[i];
+          theme = l->data;
+
           icon_info = theme_lookup_icon (theme, icon_name, size, scale, allow_svg);
           if (icon_info)
             goto out;